tests/lib/fakestore: add support for tracking channels #14840
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
valentindavid
added
the
Run nested
tests/lib/fakestore/store/store.go
Outdated
| @@ -447,6 +467,18 @@ func (s *Store) collectSnaps(bs asserts.Backstore) (map[string]*revisionSet, err | |||
|
|
|||
| snaps[info.Name].add(snap.R(info.Revision), fn) | |||
|
|
|||
| digest, _, err := asserts.SnapFileSHA3_384(fn) | |||
There was a problem hiding this comment.
The above info already carries the digest.
| return nil, err | ||
| } | ||
| } else { | ||
| sc := bufio.NewScanner(fd) |
There was a problem hiding this comment.
Missing a defer fd.Close() in here.
valentindavid
force-pushed
the
valentindavid/cherry-pick-fakestore-channels
branch
from
780172b to
49be6de
Compare
valentindavid
commented
Dec 10, 2024
tests/lib/fakestore/store/store.go
Outdated
| @@ -179,7 +197,9 @@ type essentialInfo struct { | |||
| Base string | |||
| } | |||
|
|
|||
| func snapEssentialInfo(fn, snapID string, bs asserts.Backstore) (*essentialInfo, error) { | |||
| var errInfo = errors.New("cannot get info") | |||
There was a problem hiding this comment.
Not sure what this is. I have to remove it.
valentindavid
force-pushed
the
valentindavid/cherry-pick-fakestore-channels
branch
from
d696fb0 to
710aced
Compare
Codecov ReportAttention: Patch coverage is
Additional details and impacted files@@ Coverage Diff @@
## master #14840 +/- ##
==========================================
+ Coverage 78.20% 78.27% +0.06%
==========================================
Files 1151 1154 +3
Lines 151396 152356 +960
==========================================
+ Hits 118402 119258 +856
- Misses 25662 25731 +69
- Partials 7332 7367 +35
Flags with carried forward coverage won't be shown. Click here to find out more. ☔ View full report in Codecov by Sentry. |
andrewphelpsj
approved these changes
Dec 10, 2024
| dgst, _, err := asserts.SnapFileSHA3_384(snapFn) | ||
| c.Assert(err, IsNil) | ||
|
|
||
| f, err := os.OpenFile(filepath.Join(s.store.blobDir, "channels", dgst), os.O_CREATE|os.O_WRONLY, 0644) |
valentindavid
force-pushed
the
valentindavid/cherry-pick-fakestore-channels
branch
from
ac4ca39 to
d076339
Compare
andrewphelpsj
force-pushed
the
valentindavid/cherry-pick-fakestore-channels
branch
from
d076339 to
4b8fe5d
Compare
andrewphelpsj
force-pushed
the
valentindavid/cherry-pick-fakestore-channels
branch
from
4b8fe5d to
f8c78ca
Compare
|
This is an updated to the fake store, and none of the failing tests use the fake store. |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Cherry-pick of eb2a956 from #14305 in
fde-manager-featuresbranch.